Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <[email protected]>
Thu, 31 Mar 2011 06:59:32 +0000 (08:59 +0200)
committerWolfgang Denk <[email protected]>
Thu, 31 Mar 2011 06:59:32 +0000 (08:59 +0200)

Trivial merge